Skip to content

[24.05] nixVersions.git: Fix version#324408

Merged
Artturin merged 3 commits into
NixOS:release-24.05from
Artturin:backport-323140-to-release-24.05
Jul 16, 2024
Merged

[24.05] nixVersions.git: Fix version#324408
Artturin merged 3 commits into
NixOS:release-24.05from
Artturin:backport-323140-to-release-24.05

Conversation

@Artturin

@Artturin Artturin commented Jul 3, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

(cherry picked from commit 5660f47)

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Artturin Artturin mentioned this pull request Jul 3, 2024
Merged
13 tasks
@ofborg
ofborg Bot requested review from edolstra and lovesegfault July 3, 2024 21:57
@ofborg ofborg Bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jul 3, 2024
@roberth

roberth commented Jul 4, 2024

Copy link
Copy Markdown
Member

For the CI failure on x86_64-darwin:

@emilazy

emilazy commented Jul 10, 2024

Copy link
Copy Markdown
Member

Thanks for this! Could you incorporate #326172 for the Darwin users?

@Artturin

Artturin commented Jul 11, 2024

Copy link
Copy Markdown
Member Author

Thanks for this! Could you incorporate #326172 for the Darwin users?

Done

@infinisil

infinisil commented Jul 12, 2024

Copy link
Copy Markdown
Member

For the formatting failure, see #326628

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 15, 2024
@Artturin
Artturin merged commit 62dd610 into NixOS:release-24.05 Jul 16, 2024
@Artturin
Artturin deleted the backport-323140-to-release-24.05 branch July 16, 2024 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emilazy emilazy emilazy approved these changes
@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius
@Ma27 Ma27 Awaiting requested review from Ma27
@lovesegfault lovesegfault Awaiting requested review from lovesegfault
@edolstra edolstra Awaiting requested review from edolstra

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Artturin @roberth @emilazy @infinisil @wegank